bitkeeper revision 1.1289 (425b9fe0JVvbTzMQDh4T-vsRodcmaw)

cleanup after merge

diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32 b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
index 0dd968ee5dacd351aa28c65e4a1c857b694b733a..654e61e21938c2fbb13ae6e834aeff2d4d42548b 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig_x86_32
@@ -20,6 +20,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
 # CONFIG_XEN_BLKDEV_TAP is not set
+# CONFIG_XEN_SHADOW_MODE is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_X86=y
 # CONFIG_XEN_X86_64 is not set

diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32 b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
index 276f0ad1cd9320ed09ea47dfa44ccdc88bbf07d7..f3037e68a03d3f1c512747eac08dbb344be6ff5b 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xenU_defconfig_x86_32
@@ -17,7 +17,7 @@ CONFIG_XEN_BLKDEV_FRONTEND=y
 CONFIG_XEN_NETDEV_FRONTEND=y
 # CONFIG_XEN_NETDEV_FRONTEND_PIPELINED_TRANSMITTER is not set
 # CONFIG_XEN_BLKDEV_TAP is not set
-CONFIG_XEN_SHADOW_MODE=y
+# CONFIG_XEN_SHADOW_MODE is not set
 CONFIG_XEN_SCRUB_PAGES=y
 CONFIG_XEN_X86=y
 # CONFIG_XEN_X86_64 is not set

diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index 61a3b5c9b4912b57977b44705bb9b7801b20d536..97c40072fe6f57be219c96ea7f2a3a2c306d8f7a 100644 (file)
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -398,13 +398,13 @@ static inline void shadow_drop_references(
            page->count_info, page->u.inuse.type_info);
 }
 
+/* XXX Needs more thought. Neither pretty nor fast: a place holder. */
 static inline void shadow_sync_and_drop_references(
     struct domain *d, struct pfn_info *page)
 {
     if ( likely(!shadow_mode_enabled(d)) )
         return;
 
-    /* XXX Needs more thought. Neither pretty nor fast: a place holder. */
     shadow_lock(d);
 
     if ( page_out_of_sync(page) )
@@ -412,15 +412,6 @@ static inline void shadow_sync_and_drop_references(
 
     shadow_remove_all_access(d, page_to_pfn(page));
 
-    if ( page->count_info != 1 )
-    {
-        printk("free_dom_mem in shadow mode didn't release page "
-               "mfn=%p c=%p\n", page_to_pfn(page), page->count_info);
-        shadow_unlock(d);
-        audit_domain(d);
-        BUG();
-    }
-
     shadow_unlock(d);
 }